From: Jan Beulich <jbeulich@suse.com>
Date: Wed, 1 Mar 2017 09:37:28 +0000 (+0100)
Subject: x86: re-introduce non-underscore prefixed 32-bit register names
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2625
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=36c2b869c2918c434e59d4bf6f5acecc3971f42b;p=xen.git

x86: re-introduce non-underscore prefixed 32-bit register names

For a transitional period (until we've managed to replace all
underscore prefixed instances), allow both names to co-exist.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/include/public/arch-x86/xen-x86_64.h b/xen/include/public/arch-x86/xen-x86_64.h
index 84bf0e1d58..0c00525433 100644
--- a/xen/include/public/arch-x86/xen-x86_64.h
+++ b/xen/include/public/arch-x86/xen-x86_64.h
@@ -134,7 +134,7 @@ struct iret_context {
 /* Anonymous unions include all permissible names (e.g., al/ah/ax/eax/rax). */
 #define __DECL_REG_LOHI(which) union { \
     uint64_t r ## which ## x; \
-    uint32_t _e ## which ## x; \
+    uint32_t e ## which ## x, _e ## which ## x; \
     uint16_t which ## x; \
     struct { \
         uint8_t which ## l; \
@@ -143,13 +143,13 @@ struct iret_context {
 }
 #define __DECL_REG_LO8(name) union { \
     uint64_t r ## name; \
-    uint32_t _e ## name; \
+    uint32_t e ## name, _e ## name; \
     uint16_t name; \
     uint8_t name ## l; \
 }
 #define __DECL_REG_LO16(name) union { \
     uint64_t r ## name; \
-    uint32_t _e ## name; \
+    uint32_t e ## name, _e ## name; \
     uint16_t name; \
 }
 #define __DECL_REG_HI(num) union { \